Refine folder structure
Move structure to public