Changed file structure to get rid of useless directory