Added new code

This is the rearrangement of the standard repo