Edited imports for cleaner code [Stable] [WIP]