Restructuring

Testing… testing…