Revert "Organizing Code. Looks cleaner"

This reverts commit 72daf4b2e15d49e6e59c7c5d4154a447db95f535.
Bug fixs...