Moved contents to typical folder structure