Re organized some files for better structure control