Code cleanup, moved resources files in appropriate folders