Reorganize

Fixed folder structure
Organization

Fix folder structure