Cleaned code
Add folders