Restructuring Repository

I realized I was doing things in a really wrong and disorganized way.