Change dir structure
Changes to Api