organised folders and added theme folder