Moved some files to correct dir, and added minimum requred files