Move folders to own file
Add common file