Rearranged some files to reduce clutter and added ENV file