Cleaned up the main directory, with the downside that only -f works as intended now