Restructured folders to fit original gradle structure