Changed Name of the main file and cleaned app directories