Cleaned code
Rearranged files