Revert "Make it more organized and proper"

This reverts commit 09484c4cc30acb8bc57bc6256076da7697408669.