Restructure folders for better Angular usage