Refactored folder structure to be more composer friendly