Update folder structure
Code cleanup