Moved code into single folder